SW-98. General refinements, especially for data_files specification.