Small syntax improvements.