Style fixes across the material-sprint branch.

Should bring the build back to a pleasant green colour.