Minor refactor
ControlsComparator: more clean-up
Tentative fix for #1680 "Can't use xforms-submission with the scheduler"
Minor: import