This is it -- people just need to learn how to take care of themselves when they are doing their surfing.

I have another solution that I also want to write up a how-to on for XPT -- this would let people carry a disposable virtual environment around on a USB stick, and they can co-opt an existing workstation's resources temporarily and surf in absolute safety (barring a hardware keylogger, or sniffer / proxy logs at work). This has many more uses than just porn, and I think working in this way would help people avoid cleaning work or other unsafe machines.