Fix unoccupied bitfields (#4004)

* Fix unoccupied bitfields

If there is an unoccupied bitfield set, we should just ignore it and not
keep it for the rest of the logic in `process_bitfields`.

* Bring back test, but this time corrected

* Remove incorrect code