Update pataroose's merge

Some slight cosmetic things, plus a couple of updates due to recent
changes.