Minor corrections to my previous commit. Refs #18162.