Group logic together.
Also check that cvss_v2 is a YAML Scalar (cc @robgleeson).