Reduce map usage and combine two maps into one; add isDuplicate that
tests and adds to make things more readable.