Ported first modifications to files.

References #733.