Minor syntaxix improvements