More formatting fixes

there's gonna be some bug reports in emacs d-mode for this...