Useless regex groups now non-capturing