Updated other code.

Don't know why Git sees diffs. Most of the code should be identical to
the previous version.