Modified stamp/unstamp handling in @task.