Minor modifed and test with clang. Refs #10622.