publicly needed methods are annotated

The two CharsetIssues are used by my tool.  I made the UCPM collection
private again because my tool doesn't need it anymore.