Auto-detect all standard instances in suite xml

Why the special case for only one instance?