Rolling in Jez's javap fix.