Refactor to no longer shadow built-ins of min and max

Refs #8972.