Added KeyFunctor and a few descendants to the shim.