Updated default_scope usage to squash deprecation (closes #929)