Move stuff to the cpp instead of inlining it.