Refs #14568; simplify code to avoid double indirection