Some more auto-detection support.