Make some utility code non-public