Yes, the hp pump is inside a small tank called a vapor separator on most injected outboards. I agree with you about draining the fuel but I think I might fog through the drain hole before replacing the plug. I don't think it would hurt and it might help. Login to read more.