SESE refactor. Dijkstra would be proud of me.