Ditched the default keyword-matching utils and made my own matchings - now identifiers with keyword-words in them, and hash-keys named as keywords are left as identifiers.