Expect matches to be in a sub-key.

This is to match with a recent change in the API, and allows us to
just iterate over the dictionary without needing to worry about hitting
Angular's properties.

Change-Id: Ie14cf3b6ee9f14d198731a04f949d6c73c325f5f
Fix handling of the current match.

Change-Id: I08bb6137c22653f4b293ccaf36818e65fd69faa4