Use match for world-char->world-symbol

I just keep finding lovely features for simplifying everything.