One more tweak to the "whoami" code.