FIX rebinding scope of "self" in arguments and expressions