fix: issue #889 by changing the annotated return type of waiting_for to Self.

fix: issue #889 by changing the annotated return type of waiting_for to Self. #1331