Merge wait.js into resolve.js and drop calli.wait