We should also consolidate this with @nparlante 's obfuscation / shuffle approach.  I'm thinking we might be able to get away with having only one location in the code where we shuffle the choices.