diff --git a/src/admin/admin.go b/src/admin/admin.go
index d41a48e1..ce831395 100644
--- a/src/admin/admin.go
+++ b/src/admin/admin.go
@@ -38,8 +38,8 @@ type AdminSocketResponse struct {
 }
 
 type handler struct {
-	args    []string                                   // List of human-readable argument names
-	handler func(json.RawMessage) (interface{}, error) // First is input map, second is output
+	args    []string            // List of human-readable argument names
+	handler core.AddHandlerFunc // First is input map, second is output
 }
 
 type ListResponse struct {
@@ -51,7 +51,7 @@ type ListEntry struct {
 }
 
 // AddHandler is called for each admin function to add the handler and help documentation to the API.
-func (a *AdminSocket) AddHandler(name string, args []string, handlerfunc func(json.RawMessage) (interface{}, error)) error {
+func (a *AdminSocket) AddHandler(name string, args []string, handlerfunc core.AddHandlerFunc) error {
 	if _, ok := a.handlers[strings.ToLower(name)]; ok {
 		return errors.New("handler already exists")
 	}
diff --git a/src/core/api.go b/src/core/api.go
index c312923d..ae13d499 100644
--- a/src/core/api.go
+++ b/src/core/api.go
@@ -242,9 +242,11 @@ func (c *Core) PublicKey() ed25519.PublicKey {
 // Hack to get the admin stuff working, TODO something cleaner
 
 type AddHandler interface {
-	AddHandler(name string, args []string, handlerfunc func(json.RawMessage) (interface{}, error)) error
+	AddHandler(name string, args []string, handlerfunc AddHandlerFunc) error
 }
 
+type AddHandlerFunc func(json.RawMessage) (interface{}, error)
+
 // SetAdmin must be called after Init and before Start.
 // It sets the admin handler for NodeInfo and the Debug admin functions.
 func (c *Core) SetAdmin(a AddHandler) error {