Handling situation with comments containing possible name-value pairs