Do not add value-type when it is not needed.