Commit 3cdcec43e64a0b1e9438805551d1823a968981d2

Daniel Mendler 2019-10-29T18:41:25

first batch of simplifications