Fixed #19729 -- Removed leftover refactoring helper variables.

Thanks chrismedrela for the report.

Refs #6262, 44b9076 and 4d94c0c.