Bug 3231, 2500: Major overhaul in collage annotation markup, for performance and functional fixes.