Fix some whitespace errors and leftovers from debugging.