Commit fc27777833e052dab91ca5777802e6c4e956deb4

Behdad Esfahbod 2018-11-12T17:27:34

[shape-plan] Refactor more