Patched reliance on 5.4's $this support in closures