CS fixes.
Merge pull request #4161 from dereuromark/master-cs-equals

CS fixes.