Simplify the implementation of the --args FILENAME patch, as requested by
the FIXME comment.