Update IRC links.
Clean up type names.
Merge branch 'master' into winsane