Modernizing some code.
Other changes.