Backport some whitespace and other minor tidy ups from my slotinfo to reduce the size of the changeset