For ENG-4537, minor syntax cleanup