WIP
Added tests of is-guard matching.
More work on signature matching.