Refactored weighting to apply the algorithm it represents, passing less crap around as a result.  Win/win.