Update for 016fda546: Simplify echo commands