Refactored the grammar to properly parse property values separated by spaces and commas.