Small syntax improvements