Move more methods out-of-line. This is in preparation for changing the internal