Allow use of special this.* variables in handles

Move the handle expansion after the other variables are introduced.
RM #1554