DataRef now considered in all ValueTypeCode switches