This is good.
@chriddyp Let me pull this branch, fix the merge conflicts manually, and reindent.  Then I'll review properly.