Update for upstream fixes to scl_files macro