Fixes for the AST changes.