More fixups to composition complete callback ordering.