Switch to a simpler and more correct way of dealing with template deduction
versus placeholder return types versus address-of-overloaded-function
resolution.
More tests and a comment tweak.
More tests