You are to decide which one of the options for refactoring the code would work best and then implement it. You should create a number of unit tests to ensure the sanity checks work and then test it in your own test rig application to ensure nothing has broken with the crate and scope.