A little bit of cleanup, refs #9421