Make routines internal to fix doc tests.