more complete ast support for Delta