Some syntax cleanup.