abstract syntax update (+ disambiguation of domain field)