More moved metadata (and some spurious whitespace that Emacs removed for me)