(Type Keywords): Minor corrections and cleanups.