Port KeyValues to the transitional syntax.

If so, can remove the check here as well.