* Revert "chore: perfectly forward all make_iterator args (#3980)"

This reverts commit 8da58da5.

* Redo unrelated optimization in commit

* Add tests for ambiguous overloads