Minimal functional changes.