Merge pull request #522 from mc10/cleanup

More strict comparison operator changes