Well, actually, it was about replacing the huge if () else if() else if() ... that was in place before. Maybe that function should be inlined (or even changed to a macro) to make it better.