Map widget code cleanup.