Move indent fixes to after/indent so they don't get overridden.