Rearrange fields to avoid preprocessor
Rearrange fields to avoid preprocessor

By putting the reference types last instead of in the middle, don't have
to worry about 32-bit vs. 64-bit pointers potentially overlapping
adjacent fields.

OlsonDev/YeamulNet