- moved platform dependend code into scope its respective #ifdef - killed one useless 'goto' with great pleasure - introduced duplicate code to preserve behavior (fallthrough case)