mescc: Fixes for goto.