Refactor fipa messages.