Resolve some case disagreements.