Implement async support for When's and And's.

Whew.
2.5.0
Merge remote-tracking branch 'origin/master' into yuck