Explicitly pass "--discard-comments" to OggEnc2 + some code refactoring.