I do not mind deciding everything should be in /usr but as pointed out there are other project that should adapt.
And for the sake of completeness, I already did merge. Just no remembered it! So even for merged / and /usr system there is a bug unless usrmerge is installed.
-- eric