Sure, I will provide another patch to replace them in this pull request.