[CLC-2450] More semester logic wrangling