More coding standard corrections.

For
- string comparison (to avoid false positives)
- where both values are 100% integers

Also
- removed one yoda condition
- added braces around unclear condition `()`