have '+' in them even when they don't. Escaped the + to fix.
complain less in normal situations, and deal better with netgroups, YP, ssh configuration files, and other rather normal configurations.