Formatting tidyups.
More Collection constructor tidyups.