Fix up formatting so it doesn't look awful with 8-space tabs.