Replace closure map example with direct calls

Replace closure map example with direct calls #7165