More work on the syntax.