Various changes to abstract syntax.