Support: generalise object type handling for Windows