Add todo comments regarding map behavior.