Rework type defs in BITFIELD