Now, small cleanups for vnc and rdp, then selenium.