Fixed the previously-mentioned remaining bug on handling special symbols...

..., I think.