[#889982] Ensure wrappers are included in the correct order.