Move non-dependent code out of hybrid_adapter
Move non-dependent code out of hybrid_adapter

This apparently slightly reduces the binary size in some cases.

Morwenn/cpp-sort,Morwenn/cpp-sort,Morwenn/cpp-sort,Morwenn/cpp-sort