(hoofbeats) Fixes some anonymous closures and gets scanning working.