Some syntax improvements.