Patch Set 3:

In fact no logic changes since yesterday, just some comment cleanup.
Seems to be working as expected with gerrit, the !inCore logic should stay unaffected, let me know if I am missing anything else.