'Final' fixes.  Everything seems to work now.
Remove (old) refresh token from git repo.
Pass controller id to fallback proxies.