On second thoughts, tap_hang_up is fine, but I think having a method called hang_up that called tap_hang_up and then did the appropriate wait would be ideal.