Small refactor, dummy lift to typecheck