Adapt to compose changes.
Changes to allow plotting any vaguely numerical type.