More cleanup and code harmonization.