changed: further error/callback expression mass reduction