Major cleanup.
Let derived images do the symlinking.