Fix non-scanning.
We now pass 45-smartmatch.t.