Matched the analyzer to run properly with CMSSW_5_3_21 and later