Improve bitfield handling