Refactored more subsampling code into mbar_solvers.py