Add better support for choosing old or new corpus at runtime.