db3fa8eaca
Make code more imperative than functional, preserve the information about the original root where the module mapping was discovered