Eliminate duplicate incrementer

This was the cause of half of all XML files being skipped by the
importer. Jesus, I can't believe that took three hours. Closes #406.