By either defining their types or renaming to match parent class (or
interface).

It is a somewhat fragile thing to do.

 Closes #2436

Minor code cleanup for efficiency, and tests to check the order by clause scrubbing is working correctly and not entering an infinite loop

fixes #2270