More ERR_Handler-related refactoring.