Change some conditionals involving string literals to use strcmp instead.

The current usage throws some compiler warnings.
Fixed the alignment issue on the original branch. Now both versions
agree.
Accidentally added an unnecessary file to tracking..