Backport some whitespace and other minor tidy ups from my slotinfo to re...

...duce the size of the changeset