Make use of the new optional enforce_type flag