HOPKINS: Rename last vxx variables
HOPKINS: Simplify a couple of tests in SoundManager