Get rid of ECVIOReturn() and replace it with ECVIOReturn2().

Using gotos from a macro was a bad idea.