For ENG-6702, yet more argument order mixups