Minimal code cleanup.