g: Adopt exp/dbm changes