Add removal of definitions, fix a bug with \b

We want to catch names with quotation marks in them.  We should probably
blacklist characters, rather than whitelist...