Syntax and formatting cleanup for Sphinx/Hieroglyph. Change-Id: I6ee14c0a27e8bd65deb20e4182d1bd4f7780d8ce