Various small refactorings to Variant Reporting

Same as the previous comment, I'd either change all of these instances or none.