AST continues to improve, codebase continues to byzantize.