ToUpstream: Add support for weird whoami output