Minor code cleanup of the `core_messages` core category