- if (scm_is_eq (sym, ly_symbol2scm ("context")))
- return context_property_lookup_table ? context_property_lookup_table
- : scm_c_make_hash_table (1);
- if (scm_is_eq (sym, ly_symbol2scm ("prob")))
- return prob_property_lookup_table ? prob_property_lookup_table
- : scm_c_make_hash_table (1);
- if (scm_is_eq (sym, ly_symbol2scm ("grob")))
- return grob_property_lookup_table ? grob_property_lookup_table
- : scm_c_make_hash_table (1);
+ if (context_property_lookup_table.is_bound ()
+ && scm_is_eq (sym, ly_symbol2scm ("context")))
+ return context_property_lookup_table;
+ if (prob_property_lookup_table.is_bound ()
+ && scm_is_eq (sym, ly_symbol2scm ("prob")))
+ return prob_property_lookup_table;
+ if (grob_property_lookup_table.is_bound ()
+ && scm_is_eq (sym, ly_symbol2scm ("grob")))
+ return grob_property_lookup_table;