Commit fa3ebf845fcffa827600fc4ca9fdde3aaa99f4c5

Behdad Esfahbod 2018-11-05T23:34:07

Simplify some more