Still more refactoring + upstream sync