Use singleton list if only single annotation is used.
Use singleton sets for first value; switch if second value is added.
Merge pull request #296 from sesuncedu/version4_singletons

Singletons for annotations and MapPointer value sets (first cut)