More uniform handling of waiting for a page