ToolForm: Improve collection handling