This might make some feature specs less flaky.

Also, remove a bunch unnecessary `wait_for_requests` after
calling `add_note`.