The +1 unit code for lighting control does wrap around from 16 to 1 on the MS16A, and I've used that in my setup before. The wrap-around also occurs on SS13A remotes, XPT keypad transmitters, and PR511 floodlights, which have triggers for +1/+2/+3 unit codes. Actually, I don't think I've encountered any X10 branded device where the unit code doesn't wrap around.