We can reclaim some space by moving fields in some structures
in order to allow them to pack better on 64 bit architectures.
Signed-off-by: NSteven Whitehouse <swhiteho@redhat.com>