A few minor template fixes to allow arbitrary Task ID handles.