Misc changes... mostly cleanup.