Slightly improved capability detection.