Using maxplit in the slot code splitting made it resistant to more than one hyphen, but still failed in case there were no hyphens at all. Switch to .partition() to avoid all the corner cases. Change-Id: I763ff301b8e8b2af947d9c51a34259965dc95f9f