I've had a git epiphany, git committed, git push-deleted a couple branches, git rebased, then git pushed out a new branch with just the relevant changes. I'll also edit the original message, but my component-based-block-selection has been replaced with the better version...