More syntax cleanup