Cosmetic updates.
Improve support for running historical code.