Use less stupid code to perform suites overrides. Thanks @Blasz

Refs #269.
Merge branch 'master' into geezer