Fixed a few more bugs in per-instance color support.

Per-instance color is now handled separately from vertex color and
universal color.  Vertex color still picks up universal color, if no
vertex color data is provided.  (TODO:  Clean that up)