Fix the hydration bug for real this time, and also indentation.