Tidy xim.h
Add parenthesis around PACK/UNPACK macro body