Minor syntaxic improvements