Save the first task from being thrown to task heaven.
Gregory's code cleanup ;)