Combine some of the headers.
Rename iterator typedef to n_iterator.