Stricter string comparisons.
Merge pull request #3415 from dereuromark/master-strict

Stricter string comparisons.