Quick feasibility test for #304
Merge branch 'master' into issue304
Initial implementation of improved operator handling. Provides the bulk of work for #304
Merge branch 'master' into issue304
Tuning of highlight and background modifiers
Modified tests for #304
re-disabled some nonsensical test combinations