Re: [PATCH 04/11][image_factory] Refactor argument passing a little