Tiny cleanup to ColorValue property handling