Resolved outstanding issues.

Resolved outstanding issues with variable pass through and task
deletion.