More nits and history fixes.