E1936: Clean up assignment helper methods
E1936: Clean up assignment helper methods

- Clean up methods we intend to modify
- To make them easier to work with
- Made sure assignment helper spec still passes
expertiza/expertiza,expertiza/expertiza,expertiza/expertiza,expertiza/expertiza