Fixed assumption of unique comment strings (again) [1458]