That is equally pita - I would say what you have seems like the best we can do.