Replace some template hacking with if constexpr

In order to make the TPConverter compatible with the new IdentifiableContainer, we had to put in some nasty template hacking. With C++17 we now have if constexpr which can do the job in a few lines. This MR removes the template hacking.