Make more internal bits public as bug workaround.
Make more internal bits public as bug workaround.

    Again, we need to pull out internal decls as hidden. For now, this
    works around it.

oridb/mc,8l/myrddin,oridb/mc,8l/myrddin,oridb/mc,oridb/mc