Some bits needed for depth+rgbImage in place. Cleanups.