Further rationalisation of XXXFieldManager so we push features up the
hierarchy