Replaced qualified references to TupleValue