For readability, switch to tab indents; was using a mix of tab indents,

4-space indents, and ambiguous space+tab indents.  Added an XXX comment
about a confusing part.  Still doesn't build on Windows.