I went ahead and squashed them down for good measure, in case you prefer
the single commit. BTW, I meant before/after, not src/dest re the git
diff index lines. Thanks.