HEX-493: Hide PutValue more internally