For consistency, we'd like to do 2-space indents.  Can you update this and other PR's to have all 2-space indents for your changes?