Remove some redundant logic from wait_for_answer. This also let's us get rid of one of