Supporting the preserving and compacting of annotations.
Fixed a property assignment typo.