Whitespace fixes in 7 and 8.
Explicit import in 7.