More --timeout improvements, especially for the receiving side: