rip out expr phase as part of #157