Reorganize mass.zsh a bit.