and changes had not been committed properly. Fixed up some resolver classes to ensure the generic type is a class so == null works properly. Changed to internal until we decide to expose.