Squashed a FIXME, added several more (placeholders for further message
handling).