Can these regexp changes be split into a separate PR?