Staging reparse point fix

[DodoGTA GT]

Hello,

I have made an updated version of the reparse points patchset fix that
should reduce the patch noise quite a bit (I think the original
version is better in terms of code duplication though)