(Revised from the original patch contributed by Michal Pasternak.)

Also, make a couple minor fixups elsewhere.