bug 58740: add @Internal annotations and decrease access level to methods that only exist for unit testing