improve a few of the getbit/putbit macros to be syntactically more like real C statements