Make echo/return values consistent.