More lazy instantiation handling...