Made the QString-related changes from Harald's suggestions.

Just made some minor QString-related changes.

REVIEW: 115821