Start on refactored SystemF proof