New branch, AST typemod in progress