Consistent spacing.
Deal with UltiSnips changes.