For ENG-6702, fix various argument passing mixups. Coercing integers to booleans can DIAF