Make "variable" singular, where appropriate.