Refactored the accessor macros a tiny bit.