Unexport more package internals