Remove __builtin_expect and goto usage