More compare improvements.