oops, still 1 more on image-spec refactor.