Returned old const matching optimization