More cleanup of old Taskgroup SystemMap code.