Applied simplifications and code clean-up as in 44100 analysis script.