A few changes
Wrap lines
Cleanup now that mozilla/rust#3511 is closed
import: first part of 06 + related changes