hunting down test issue

and while we're at it, use return callback(...) style in a few more places