Minor. Dependency on admin() removed.