job:  #10195  clean-up from first review comments
job:  #10195  clean-up from first review comments

cortlandstarrett/mc,keithbrown/mc,lwriemen/mc,rmulvey/mc,leviathan747/mc,leviathan747/mc,lwriemen/mc,keithbrown/mc,rmulvey/mc,keithbrown/mc,cortlandstarrett/mc,leviathan747/mc,rmulvey/mc,rmulvey/mc,leviathan747/mc,xtuml/mc,lwriemen/mc,rmulvey/mc,cortlandstarrett/mc,xtuml/mc,lwriemen/mc,lwriemen/mc,cortlandstarrett/mc,leviathan747/mc,leviathan747/mc,xtuml/mc,cortlandstarrett/mc,lwriemen/mc,keithbrown/mc,keithbrown/mc,keithbrown/mc,xtuml/mc,cortlandstarrett/mc,xtuml/mc,rmulvey/mc,xtuml/mc