Moved some public functionality to package scoped.