Refs #16960 EEA; pylint fixes