Move the temporary spout stuff to a temporary listener like we did with Econ.