Correct collections variable definitions to avoid many scaladoc warnings.