Rework ToolDataParameter and ToolDataCollectionParameter to_dict to filter over valid matches.

Doesn't do anything with them yet.