removed most of the "goto" patches from optional.go.patch, since goto is now supported