Analyzer fixes for callout hiding, and more transparent callouts.