I'm not sure why you felt you need to change it. It actually makes the code more complex to me.
Did you measure any performance impact?