Patch fin and tap to avoid loosing context.

Fin and tap take a callback function which is invoked outside of the namespace and require explicit patching.