Fix the other location where echo appears.

Also, ran scalariform on previous code.

Review by @havocp because I missed an echo test.