Move around counting logic for types, and fix title counts.