Move bindings out of prolog-hook