Clean up colormap/skin translation code.

There's more to do here when I break protocol compatibility, but
not yet.