remove u.u_error; fixes in previous delta; rearrange compat code