Keep annotations out of UDAs; support modifying tasks with UDAs