Better timeout defaulting code