Story 44013941: withclass fixup for sections list