Make UUIDs parsable.
Adapt to recent CAF change.
Add forgotten return to erase().