Alex,
Do you mean removing the conditional or removing allarch inherit?
I don't think I can find the time to work on either of those as it would involve additional research and testing to make sure nothing breaks in the process.
While I would like to help, doing major changes or large refactoring to address an issue already solved is likely outside the scope of my job responsibilities.
As downstream users of the code, we were hoping the patch could be merged, as we would then not have to maintain it on our side.
I suggest to merge it as-is and then have somebody else work on proposed changes.
Otherwise, I would like to open a bug report so that when the issue is eventually resolved, we could drop the patch.