Pass type and title token through from #definition_indexes

That way we can get rid of a loop from names_containing_dash.