Various source code cleanup. No functional changes.
Simplify demo topology config file for digits demo.