simplified
1903df89 · Simplifications now that all inputs have filenames. ·