I think it might be a good idea to submit this to Steve for ORM 6 but I wouldn't do it for 5 as it's a risky and invasive change that will be a pain to merge.

Doing it in Search for now while waiting for ORM 6 is IMHO acceptable.