Switch scopes to Procs to avoid deprecation.