Put the support for bitfields back into place.