You're right of course. Just remember to use addition mod X instead of xor in that case to combine the choices.