I mean get rid of the empty line -- but this PR is complex enough: we can leave it as-is for now.  Sorry to get down into the weeds ;)