Incremental update toward VQ integration, vorbis_info rearrangement