type-editing (from GitHub, not compile-checked)

I also removed a bunch of spaces that looked non-syntactic.  Feel free to pull out this commit if it's not useful.