WIP commit, starting to fix letfn lifting