Address suggestions from @zpao.