The true 1-line change for this pull request.  Everything else is reordering and fluff.