SCHEMA-247. Pattern matcher fixes.