Use a non-capturing group by default (#1060)

Now clients don't have to decide whether they need parentheses or not.
Simplify word boundaries (#1060)

Use lookahead/lookbehind matching to ensure there is whitespace around the
token. Replaces the use of \b, which doesn't work for "ft.", etc.