Reorganize .osx a bit

* Use indentation in the DEF heredoc.
* Keep `killall SystemUIServer` close to where it matters.