Various small refactorings to Variant Reporting