Only bother with a _MASK define if bitfield > 1. Also fix bug in MASK value.