Moving timeout to options struct. Preventing proliferations of small options. #2147