More code quality improvements that are all over the place.