Fix and simplify echo example.

Having an on-data handler overrides the pump, so don't do that.
Minor cleanup/reorg.
Have pumps start by default.