Jumping almost 8 years ahead, to the repo latest commit cdecl: add check phase cdecl: further refactoring