Various unrelated code quality enhancements and fixes with no effect on execution.