Prefer 'class X; class Y' instead of the short form

The person who was a strong proponent for the short form no longer works here. I believe the rest of us prefer this form.

- [ ] HN
- [ ] VA
- [ ] AR
- [ ] KP
- [ ] TS
- [ ] JK