update: Return to using the original and obvious form of the code.

Thanks Grubba for fixing the issue! Pike 4e1b09 solves it; if you're having
trouble, update your Pike. (It's about 500 commits' worth of 8.0 branch, no
more, that have this.)