Changed syntax of `yield unicode()` statements to std if-else construct