Ensure use of "echo_i" where possible

In many instances echo "I: construct was used where echo_i function should have been.

Closes #2218 (closed)