Port KeyValues to the transitional syntax.

Is |delete null| valid?