HOPKINS: Fix signness issue, get rid of another GOTO