Changes as requested by @cpeterso.