The STANDARD_CLEANUP_BLOCK macro no longer needs a parameter