[WIP] Make data clump handle anonymous params

This depends on #312 so no need to review yet.