License headers and other tidy-up.