Minor style normalizations to minimize the diffs between *now* and from