Added support for guarded templates ("onlyIf") which also means that a
row with no match is now a warning not an error.