Related to #592. We should audit all call sites to see if they should be fixed in a similar way. Better, we should see if there is a way to change the API so that it's harder to make a similar mistake.