AUI-1160 Don't generate unused options