Syntax definition fixes