Removing more references to this inside closures