Near-final changes.