I think that should be fine...  It would make the code much simpler. Let's not optimize yet..