Tidied up IoC registration to cope with removed Validator<T> injections.