Add try/finally blocks to new bootstrap macros