refs #6667 Comments and code niceness.