Revert "Eliminate bitfield enum members." This reverts commit 56702e6d60883f2d1e33641b907680a852cdb15a.