Some more code changes.