I knew that I was maknig it more complicated than needed. This seems like the cleanest approach so far - although the xor trick is pretty nice.

Thanks everyone for the as-ever illuminating responses.

qq