Low: More prep-work for consistent code formatting
Mercurial revision: 4cc8fdf2827a31d41b48b8c97d784c75c9418eda