Commit c7be933439af1bc8251b2b19df75b42bd0f3bdb5

Behdad Esfahbod 2018-11-12T17:49:15

[shape-plan] Refactor some more