Change types used in bitfields to be `int's.