`Q.resolve` and `Q.when` to `Q`, where possible.

Inspired by https://github.com/kriskowal/q/pull/344#issuecomment-21127346.