Fix conflict issue with alpha renaming of this in arrow functions

By doing the alpha renaming in the outer function first we do the renaming of inner arrow functions too.

Fixes #466