Make formatting more consistent in opaque mode change.