Tweaked things for more consistent style.