Consistent use of pointer vs reference_wrapper

[jacobmerson]

using ptr in some places and reference wrapper in others makes for a clunky interface that's inconsistent in some places. Reference wrapper was used to imply that in those places, the pointers should not be null.

However, it's not clear that these semantics are worth the extra effort that's needed to convert the ptrs into reference wrapper.