original_file_name can be expressed much more clearly with xpath, 

and we get to delete a lot of code. One behavior change in video_spec, which is going in the direction we want for #1079.