Renamed void block typedef to avoid naming collisions
Fixed uninstalling exception handler to restore previous exception handler
Merged changes