Clean up

of recent changes. Part one of several, I suspect.