Updated to handle the new SPEC95 configuration options.