Moved some more task management around to better utilize the async/await keywords.

Signed-off-by: Ryan Hatfield <ryan.hatfield@onsharp.com>