More R-spec changes, changed a collect to a map