7TeV fixes from Isobel

Works around features not supported by CMSSW 4_2_8 version of gcc.

Same as #260 but with a merge conflict fixed.