- static SCM safe_module;
- if (!safe_module)
- safe_module = scm_primitive_eval (ly_symbol2scm ("safe-module"));
-
-
- answer = scm_eval (form, safe_module);
+ static SCM module = SCM_BOOL_F;
+ if (module == SCM_BOOL_F)
+ {
+ SCM function = ly_lily_module_constant ("make-safe-lilypond-module");
+ module = scm_call_0 (function);
+ }
+ answer = scm_eval (form, module);