Further gross changes to style.