Cool, if we agree on the non-BC change then yeah we can make it simpler.  (Regardless of what mojito-current does, mojito-next should _only_ have the by-filename lookup.)