Moving function classifications out of event information and into map output.