Move the test for DesktopSize being last into the DesktopSize-specific function.