Updated to work around StrAndUnicode removal in 1.7 (fixes #61)