Report and fix by Michael McMaster. Some minor code beautification by me, also avoid memory leaks in the special-case paths.
