Gustavo’s modifications (everything must be re-written into Lambda terms)