comp: Avoid skipping initialization when goto a cleanup

(Found by compiling codebase as C++, which is stricter.)

This just puts the initializations that upsets the compiler into their own nested scopes, which fixes the compile error.

cc @wallbraker