Almost-final version.