Fix double quoted VALUE_PAIR definitions