Patch up type-hint inside go blocks