*: small code shrinks and compile fix for unicode

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
5 files changed