diff --git a/libraries/chain/account_object.cpp b/libraries/chain/account_object.cpp
index c25abdd8..466f7a6f 100644
--- a/libraries/chain/account_object.cpp
+++ b/libraries/chain/account_object.cpp
@@ -59,8 +59,8 @@ void account_statistics_object::process_fees(const account_object& a, database&
          // Check the referrer -- if he's no longer a member, pay to the lifetime referrer instead.
          // No need to check the registrar; registrars are required to be lifetime members.
          if( account.referrer(d).is_basic_account(d.head_block_time()) )
-            d.modify(account, [](account_object& a) {
-               a.referrer = a.lifetime_referrer;
+            d.modify( account, [](account_object& acc) {
+               acc.referrer = acc.lifetime_referrer;
             });
 
          share_type network_cut = cut_fee(core_fee_total, account.network_fee_percentage);
@@ -76,8 +76,8 @@ void account_statistics_object::process_fees(const account_object& a, database&
          share_type lifetime_cut = cut_fee(core_fee_total, account.lifetime_referrer_fee_percentage);
          share_type referral = core_fee_total - network_cut - lifetime_cut;
 
-         d.modify(asset_dynamic_data_id_type()(d), [network_cut](asset_dynamic_data_object& d) {
-            d.accumulated_fees += network_cut;
+         d.modify( d.get_core_dynamic_data(), [network_cut](asset_dynamic_data_object& addo) {
+            addo.accumulated_fees += network_cut;
          });
 
          // Potential optimization: Skip some of this math and object lookups by special casing on the account type.
diff --git a/libraries/chain/db_balance.cpp b/libraries/chain/db_balance.cpp
index 5029d3b7..55729050 100644
--- a/libraries/chain/db_balance.cpp
+++ b/libraries/chain/db_balance.cpp
@@ -210,7 +210,7 @@ void database::deposit_cashback(const account_object& acct, share_type amount, b
        acct.get_id() == GRAPHENE_TEMP_ACCOUNT )
    {
       // The blockchain's accounts do not get cashback; it simply goes to the reserve pool.
-      modify(get(asset_id_type()).dynamic_asset_data_id(*this), [amount](asset_dynamic_data_object& d) {
+      modify( get_core_dynamic_data(), [amount](asset_dynamic_data_object& d) {
          d.current_supply -= amount;
       });
       return;
diff --git a/libraries/chain/db_maint.cpp b/libraries/chain/db_maint.cpp
index 2b386633..10bc0ac3 100644
--- a/libraries/chain/db_maint.cpp
+++ b/libraries/chain/db_maint.cpp
@@ -398,8 +398,8 @@ void database::update_active_committee_members()
 void database::initialize_budget_record( fc::time_point_sec now, budget_record& rec )const
 {
    const dynamic_global_property_object& dpo = get_dynamic_global_properties();
-   const asset_object& core = asset_id_type(0)(*this);
-   const asset_dynamic_data_object& core_dd = core.dynamic_asset_data_id(*this);
+   const asset_object& core = get_core_asset();
+   const asset_dynamic_data_object& core_dd = get_core_dynamic_data();
 
    rec.from_initial_reserve = core.reserved(*this);
    rec.from_accumulated_fees = core_dd.accumulated_fees;
@@ -452,8 +452,7 @@ void database::process_budget()
    {
       const global_property_object& gpo = get_global_properties();
       const dynamic_global_property_object& dpo = get_dynamic_global_properties();
-      const asset_dynamic_data_object& core =
-         asset_id_type(0)(*this).dynamic_asset_data_id(*this);
+      const asset_dynamic_data_object& core = get_core_dynamic_data();
       fc::time_point_sec now = head_block_time();
 
       int64_t time_to_maint = (dpo.next_maintenance_time - now).to_seconds();
@@ -613,8 +612,8 @@ void split_fba_balance(
    if( fba.accumulated_fba_fees == 0 )
       return;
 
-   const asset_object& core = asset_id_type(0)(db);
-   const asset_dynamic_data_object& core_dd = core.dynamic_asset_data_id(db);
+   const asset_object& core = db.get_core_asset();
+   const asset_dynamic_data_object& core_dd = db.get_core_dynamic_data();
 
    if( !fba.is_configured(db) )
    {
diff --git a/libraries/chain/db_update.cpp b/libraries/chain/db_update.cpp
index eb4acd0d..5c0fbfc9 100644
--- a/libraries/chain/db_update.cpp
+++ b/libraries/chain/db_update.cpp
@@ -45,7 +45,7 @@ namespace graphene { namespace chain {
 
 void database::update_global_dynamic_data( const signed_block& b, const uint32_t missed_blocks )
 {
-   const dynamic_global_property_object& _dgp = dynamic_global_property_id_type(0)(*this);
+   const dynamic_global_property_object& _dgp = get_dynamic_global_properties();
    const global_property_object& gpo = get_global_properties();
 
    // dynamic global properties updating
diff --git a/libraries/chain/worker_evaluator.cpp b/libraries/chain/worker_evaluator.cpp
index cf6f0e00..b5aea8f3 100644
--- a/libraries/chain/worker_evaluator.cpp
+++ b/libraries/chain/worker_evaluator.cpp
@@ -106,7 +106,7 @@ object_id_type worker_create_evaluator::do_apply(const worker_create_evaluator::
 void refund_worker_type::pay_worker(share_type pay, database& db)
 {
    total_burned += pay;
-   db.modify(db.get(asset_id_type()).dynamic_data(db), [pay](asset_dynamic_data_object& d) {
+   db.modify( db.get_core_dynamic_data(), [pay](asset_dynamic_data_object& d) {
       d.current_supply -= pay;
    });
 }