Remove redundancy in *Choice flag creators