Further hardening. Refs #18766.