Update should warnings for myron's changes.