Improve paredit again