Improvement to EnlistXAResourceHandler regular expression