Since splitting is almost abolished, it's generally simpler to base the data flow nodes on AST nodes rather than CFG nodes. CFG nodes still play a role, and they're still mixed up in calculating enclosing (data-flow) callables, and dealing with that is postponed for now to keep the size of the refactor in check.