Add fallback scheme for waitFor and extract.