Fixed a lot of the elaboration issues, but triggered a bug in the
finalization of the ESL.Client.Tasking.Instance.
This will be investigated further.