Last-minute cleanups before crispy.