More regex finetuning in context