Address dependency on six during dev/testing. Fixes #1205.