Bah, still working on getting Emacs to eat trailing whitespace.