Handle identifiers with capitals and quotes in NodeToString

First is just restoring #141, which was accidentally undone by #143, and noticed the second while in the area.