Comment out schema comments in SQL, minor code re-arranging.