move AutoField et al to Bundle; kill generics