CLC-2310 - Simplify handling of multiple "current terms"