The patch "remove redundant explicit $enableval assignments" broke
several options with non-standard variable names.