Merge "Cleaning up task loading code."