Got rid of two Code Analysis suppressions by turning a type into a module.