rdy_timeout handling round 2

more cleanup re: #36 cc @jehiah