Extracted task identifiers. Small fn & var cleanup.