move stuff from Image.completeExpand to Image.expand