Agreed. I'll think more about this and submit a change if I come up with a better solution.