Fix bugs caused by terrible retabbing. Oops!