I think it was cleaner before. Since the change ended up not being used, I am inclined to put it back the way it was.