Ah, I think I wrote too early. For specificity reasons, that wouldn't work. So, the original code is better.