Removing GOTO's to subsequent labels

Reducing size of inlined code by removing reduntant GOTO's