There are also some corrections here for existing reftests because the old temporary 'stretch' scaffolding was wrong in many ways.