add deferred substitution and closures to FAE