Yet more composition work.