Drop function and method wrappers so only one implementation and rename dynamic wrapper as function wrapper.