Remove annotated terms; defer unfolding of definitions to ease typechecking