NEVERHOOD: Change more message values to enums