Formatting changes, in particular ensure underscores in identifiers not interpreted as style markup