Improving/fixing @swanson's unprintable chars scrubber.

Related to 538467e.