Minor formatting cleanup only (e.g. indents, tabs -> spaces).

This is purely formatting cleanup, prior to starting actual work.  Zero functional changes.