Replace simple section task definitions with new factory function #3307