Revert "Revert "Assumptions work, cleanup""

This reverts commit fc639db9302b23f6bfc33496dadfb038777da2fb.