Cleaning up header and typdefs for iterators, also fix for isinf and isnan