Implement more consistent usage escaping.
Partial fix for #149