This is interesting. It would be better not to put code into the repo that we were intending to remove. Although with both pull request still in progress I'm not sure which will be ready to go in first. For now, maybe you can mark the portions of the code that you intend to replace with Alex's changes.