Noncapturing group! That's what I get for hacking straight on master!