So I'd vote for making the changes mentioned above and removing the workaround, assuming my analysis is correct.