Refactor discriminator merging for Scrutinizer