Minor cleanup, and some early prepartion for a potential Windoze port