Make dirty hack less dirty when choosing the slots

Still don't know where sizes get screwed up.

milestone2