Match Docker's refactoring