Cleaning up Wrangler annotation logic.