Fixed variant_samples etc all showing up when not requested.