Yup, that makes sense. Better to have toggles or flags and enhance cohesiveness than maintain entirely separate files (e.g. -fx, -nfa etc).