mChoice.c: fixed some inconsistencies