Fix compilation with a recent ADT