Some more `image` refactoring