Make consistent use of InfoMap datatype

follow up on b44a73ea42e7cc66a7766b7e8a2b8c55830233fc
MythNetVision got missed.

Also removed non-required headers