Some are important, e.g. the seemingly harmless braces around if with dprintf, since that dprintf is defined as empty, will screw things up and grab the next line Change-Id: Ie5e1cf813178ad708ff42ae5e477fbc96034471c