Merge "taskReturnToType be gone!"