Minor changes and cosmetics according to Anders.

No match.