Tighten the semantics of the --files option

(and fix the feature -- broken since 5164601)
DRY: use superclass method to read file content