Further callback error check style fixes

Okay, I've decided I like the readability of this style much
better so I used it everywhere.