Are these changes strictly necessary? Explicit relative imports are a little easier to read IMO.