Merged r7732:7734 from jcorgan/boolean into trunk. Add's Tim Meehan's gr.xor_* blocks.