typep'ing fixes much. Emacs whitespace mods as well.