Use a single regex for fetch; adjust contents-file generation