Yes, I think it is possible to make one regexp instead of two. I'll try to merge them.