Also some minor style cleanups.
Split out the bus attachments so the impact of the bus xxxvar.h files with the inline macros for the ivars are confined to one file each.