I finally got around to fixing the gas overflow problem that I've had on my TJ for a couple years now with the guide Chris posted (
https://wranglertjforum.com/threads/wrangler-tj-gas-overflow-fix.244/). I found a video of the same fix was also helpful and it had a good tip to reinforce the replacement hose in order to prevent kinking.
After the fix, I topped off the tank and was happy to see the pump just click off without gas sputtering everywhere.
And while I was at it, I did my oil change for hitting 75k miles.