diff --git a/src/context.cc b/src/context.cc
index df8210f8..af566113 100644
--- a/src/context.cc
+++ b/src/context.cc
@@ -65,26 +65,6 @@ Scope& Context::scope() const
     return GlobalScope::instance();
 }
 
-OptionManager& Context::options() const
-{
-    return scope().options();
-}
-
-HookManager& Context::hooks() const
-{
-    return scope().hooks();
-}
-
-KeymapManager& Context::keymaps() const
-{
-    return scope().keymaps();
-}
-
-AliasRegistry& Context::aliases() const
-{
-    return scope().aliases();
-}
-
 void Context::set_client(Client& client)
 {
     kak_assert(not has_client());
diff --git a/src/context.hh b/src/context.hh
index e2f45cc1..27887659 100644
--- a/src/context.hh
+++ b/src/context.hh
@@ -102,10 +102,10 @@ public:
 
     Scope& scope() const;
 
-    OptionManager& options() const;
-    HookManager& hooks() const;
-    KeymapManager& keymaps() const;
-    AliasRegistry& aliases() const;
+    OptionManager& options() const { return scope().options(); }
+    HookManager& hooks()     const { return scope().hooks(); }
+    KeymapManager& keymaps() const { return scope().keymaps(); }
+    AliasRegistry& aliases() const { return scope().aliases(); }
 
     void print_status(DisplayLine status) const;