Further comment tidy and code reorg.
Port sp0rkle's panic recovery back into goirc.