Redid the formatting fix for this pull to be a little more robust.