Various cleanup changes.