All relevant information now available from the ActivityState.
Created attachment 293619 [details] Fix
Created attachment 293622 [details] Fix
Created attachment 293624 [details] fix
Committed revision 208329.