Upgrading the PSI Muon Facility