Prune conversion dependencies

These commits add a few more additional tests, then remove unnecessary includes. Tests pass after each change on g++, msvc-8/10/12, clang.