Restructured a handful of read / write properties.

Test flight of replacement macro.