I think we should add some FIXMEs here so we don't forget to get rid of the goto usages.