Fix various Sonar issues in MRConsumerImpl