Surrounded `goto`s with braces.

This will avoid the now-infamous `goto fail` problem.