[mb-style] 'Op. XX No. YY' or 'Op. XX, No. YY'

[mll]

Hi all,

I'd like to fill a hole in ClassicalStyleGuide
(http://wiki.musicbrainz.org/ClassicalStyleGuide): the case where a track is
numbered 'Op. XX No. YY', like 'Mazurka in B major, Op. 63 No. 1' (example
at http://musicbrainz.org/track/576a7830-8240-4611-804c-256ee0e4bce3.html).

I can see to ways of expressing it:
1) 'Mazurka in B major, Op. 63 No. 1'
OR
2) 'Mazurka in B major, Op. 63, No. 1'

I personnaly favour 1), what's your take?

And if we come to an agreement, should we take out the heavy gun of a RFV?
This is an addition to the rule, not a change per se.

Cheers,

MLL