Updates as requested by @cpeterso.