big cleanup. message_passing 2.0 looks quite nice now.