Clean up some code. Prepare for higher model version numbers. Rename sln