Update the new scanner to follow the new regex scanning rules.