Yet more work on composition.