I'm sorry, I misunderstood. That is indeed simpler and clearer -- will fix.