issue7213: - fixed trailing comma and spaces in empty lines