Further syntactical changes