Update codefolding for 3.x changes