Improved (maybe) handling of multiple-character symbols