Incremental code cleanup.