Remove duplicate branches, multiline block chains, and reduce method complexity in average and count report builders.