Updates as requested by @cpeterson.