Slightly fixed up Q.extend from last commit