Cleanups

Continuing the cleanup process...
That seems reasonable on principle, although that's not what your diff actually does :)

Your diff, if I'm not mistaken, will complain that $_ is undefined (or if it's not undefined, $qchar will be given some unexpected, random result).