Made some minor changes. Refs #8169.