Rearrange canBuy/canWait calculations