Minor refactoring before hooking up 2D plots to eqsans