Whitespace cleanup.
Set types for upgrade.