Tweak the expansion code for BIT_CONVERT to generate better code