Further improved regexp-unparse output