We should definitely do that, good thought. Mind if we do that on a small, separate branch? There is one other occurrence of such a wait.