Making username detection more robust and less chatty.