I do a "return" right to the fuel bottle.

My procedure is as follows:
Pull the line off the needle valve. Plug pump line into that.
Pull the line off the muffler, out return line onto that.

Put pump draw line (with filter on it) in to the can. Put end of draw line pointing into can.

Pump. When tank gets full, fuel overflows through return line straight into the fuel can it came from. Not a drop spilled. Reverse pump a couple of times, sucking all the fuel in the return line back into the tank.
Disconnect the return, re-attach line to muffler.
Disconnect line that was on needle valve, and replace on needle valve.
Reverse pump so that all fuel in lines gets returned to can.

Done.

gus