Merge pull request #342 from peternewman/trivial-fixes

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