Incorporate feedback from @dhermes.