Pending code changes (more).