Make window-margin use (now-updated) canonical upstream repo