Second editing pass.