Update regex to be more charybdis-like.