Clean up the meta-data class.
Clean up the message available listener bits as well as some other minor
things.