Fix C99 __func__ for MSVC
Some callback error check style cleanups

I find this easier to read...