easier to spot missed tests (when guard and cmd-line differ)
seems to fit the layer much better as we really have a very reduced instruction set