Avoid using echo -n even indirectly

XXX: ensure that ^M is preserved.