Surrounded goto's with curly braces.

Don't want a `goto fail;` error.