Use more generic shim style
Move callback invocations outside try/catch
0.25.0