Cleaned up object size and field offsets a bit.