I took Karl's changes and updated them accordingly. I've also added a small test. The patch containing his importer, my changes, and my test is attached (the commit was made using my name--not sure if I should instead apply Karl's patch).