Move a few more 4.3.4 guild handlers to its own module