Fix a few more scope boundary issues with arrow functions