Fix regexps so that non-word symbol constituents can be marked as such.