Fix double-escaping of , and ; in compound properties