CS fixes.

Use strict checks for strings where applicable.