A little cleanup, refs #6574