Improve r97239 with comments from Aaron. Also fixed another typo that was lurking...