I made a false assumption about which values would be added in my last CL. Sending a CL shortly to remedy that.