Fix up Class.adapt to be a bit simpler