Move more onto *Object.