Did some cleanup of stray constants, much more work to be done.