[#39965603] continue refactoring CheckableLists