Fixing annoying issue with JSON-like structures in grammar