PREPARE-GLOBAL-CALL: Deal with redefinition by using FDEFINITION-OBJECTs.
Simplify the code a bit.