This seems like a bug-fix, shouldn't this go in a seperate commit them? And can't you use the TranslateLegacyPath to do a single compare?