Fix the versioned wrapper tasks to work properly with incremental build.
Build with 1.7-rc-2.