Use the new message saving stuff in the parser as well.