cpp:bitfield: touch up code