Stuff to support task-2.4.

We want to stay backwards compatible with task-2.3 too.