While we are at it, let's do it right and call getValueForValueId<T> as it was somewhen before and eliminate the code duplication all together. Also, reduce the the duplication within getValueForValueId, please? :-)