Issue 5052: Default show annotations behavior fix, and cleanup.