Refs #9445. Fixing more style problems.