Renamed all remaining local type vars to start with an underscore