More syntax cleanup.