Enhance support for object using NOWAIT in various places.