Bug 5535716 A bit of windowed mode cleanup.