Added comment to remember to fix something wrt char-sets at some point.
Added defined constant where a constant was used (twice) for clarity.
Authored by: dwarren 2014-04-01
Parent: [r7943]
Child: [r7945]
