Fix to semantics of application
Modify closure encoding