CR: Final nits.