Apply my \c changes to echo. It should also be noted that this is: A) going into 2.2, not 2.1 B) a functional no-op unless you actually use it!