Refactors asserted distribtion features to work in new pattern.