Fix up latest file changes, #2.