Be more liberal about how formats are detected.