I'm fine with the first -> object change, seems to make sense to me, even though it will hardly ever be a problem in practice.