Modify files to better support arbitrary concrete usage.