Server: clean up output a bit.

Also:

- Remove now incorrect comment.
- Simplify the external/dist logic a bit.