diff --git a/autoload/editorconfig_core/fnmatch.vim b/autoload/editorconfig_core/fnmatch.vim
index 6f60db5d0..ef9ced9fd 100644
--- a/autoload/editorconfig_core/fnmatch.vim
+++ b/autoload/editorconfig_core/fnmatch.vim
@@ -45,22 +45,24 @@ if !exists('g:editorconfig_core_vimscript_debug')
 endif
 " }}}1
 " === Regexes =========================================================== {{{1
-let s:LEFT_BRACE = '\v%(^|[^\\])\{'
+let s:LEFT_BRACE = '\v[\\]@8<!\{'
+" 8 is an arbitrary byte-count limit to the lookbehind (micro-optimization)
 "LEFT_BRACE = re.compile(
 "    r"""
 "
-"    (?: ^ | [^\\] )     # Beginning of string or a character besides "\"
+"    (?<! \\ ) # Not preceded by "\"
 "
 "    \{                  # "{"
 "
 "    """, re.VERBOSE
 ")
 
-let s:RIGHT_BRACE = '\v%(^|[^\\])\}'
+let s:RIGHT_BRACE = '\v[\\]@8<!\}'
+" 8 is an arbitrary byte-count limit to the lookbehind (micro-optimization)
 "RIGHT_BRACE = re.compile(
 "    r"""
 "
-"    (?: ^ | [^\\] )     # Beginning of string or a character besides "\"
+"    (?<! \\ ) # Not preceded by "\"
 "
 "    \}                  # "}"
 "
diff --git a/autoload/editorconfig_core/ini.vim b/autoload/editorconfig_core/ini.vim
index d773323f1..55d2dee4e 100644
--- a/autoload/editorconfig_core/ini.vim
+++ b/autoload/editorconfig_core/ini.vim
@@ -49,8 +49,8 @@ let s:SECTCRE = '\v^\s*\[(%([^\\#;]|\\.)+)\]'
 let s:OPTCRE = '\v\s*([^:=[:space:]][^:=]*)\s*([:=])\s*(.*)$'
 
 let s:MAX_SECTION_NAME = 4096
-let s:MAX_PROPERTY_NAME = 50
-let s:MAX_PROPERTY_VALUE = 255
+let s:MAX_PROPERTY_NAME = 1024
+let s:MAX_PROPERTY_VALUE = 4096
 
 lockvar s:SECTCRE s:OPTCRE s:MAX_SECTION_NAME s:MAX_PROPERTY_NAME s:MAX_PROPERTY_VALUE
 
@@ -155,18 +155,6 @@ function! s:parse(config_filename, target_filename, lines)
                     echom printf('Saw raw opt <%s>=<%s>', l:optname, l:optval)
                 endif
 
-                if l:optval =~# '\v[;#]'
-                    " ';' and '#' are comment delimiters only if
-                    " preceded by a spacing character
-                    let l:m = matchlist(l:optval, '\v(.{-})\s[;#]')
-                    if len(l:m)
-                        let l:optval = l:m[1]
-                    endif
-
-                    " ; and # can be escaped with backslash.
-                    let l:optval = substitute(l:optval, '\v\\([;#])', '\1', 'g')
-
-                endif
                 let l:optval = editorconfig_core#util#strip(l:optval)
                 " allow empty values
                 if l:optval ==? '""'
diff --git a/tests/core/tests b/tests/core/tests
index 6c8fe6815..5ca0b296d 160000
--- a/tests/core/tests
+++ b/tests/core/tests
@@ -1 +1 @@
-Subproject commit 6c8fe6815b12f96f4b357d610ee1cd8da074880a
+Subproject commit 5ca0b296dc31124d0303895c163013450bd97958