Add support for even more weird whoami output