fix true/false/null incorrectly matching the first substring of longer identifiers