Do you want me to remove those blank lines separating the different types?  I thought it sounded like we'd leave it as is, but maybe I misunderstood.  Are you waiting on me for anything to tidy up to merge this PR?