Changes based on feedback from @nhunzaker.