Fixed breakages to collection module caused by recent refactoring.
Minor comment/style improvements.
Style fix.
Simplified translation.