diff --git a/bin/cdist-config b/bin/cdist-config
index 942b4ea7..b120392e 100644
--- a/bin/cdist-config
+++ b/bin/cdist-config
@@ -82,7 +82,7 @@ __cdist_abs_myname="$__cdist_abs_mydir/$__cdist_myname"
 
 
 ################################################################################
-# Exported variable names (usable for non core
+# Exported variable names (usable for non core)
 #
 : ${__cdist_name_var_explorer:=__$__cdist_name_explorer}
 : ${__cdist_name_var_type_explorer:=__$__cdist_name_type_explorer}
diff --git a/bin/cdist-object-gencode b/bin/cdist-object-gencode
deleted file mode 100755
index e21568a3..00000000
--- a/bin/cdist-object-gencode
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#
-# 2011 Nico Schottelius (nico-cdist at schottelius.org)
-#
-# This file is part of cdist.
-#
-# cdist is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# cdist is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with cdist. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Generate code from one object (object must be relative path!)
-# WARNING: OUTPUT ON STDOUT, ERRORS NEED TO BE ON STDERR!
-#
-
-. cdist-config
-[ $# -eq 3 ] || __cdist_usage "<target host>" "<object>" "<type>"
-set -eu
-
-__cdist_target_host="$1"; shift
-__cdist_object_self="$1"; shift
-__cdist_gencode_type="$1"; shift
-
-__cdist_type="$(__cdist_type_from_object "$__cdist_object_self")"
-__cdist_type_gencode="$(__cdist_type_gencode "$__cdist_type" "$__cdist_gencode_type")"
-__cdist_code_output="$(__cdist_object_code "$__cdist_object_self" "$__cdist_gencode_type")"
-
-# export variables for the gencode script
-export __object_id="$(__cdist_object_id_from_object "$__cdist_object_self")"
-export __object="$(__cdist_object_dir "$__cdist_object_self")"
-export __global="$__cdist_out_dir"
-
-if [ -x "$__cdist_type_gencode" ]; then
-   __cdist_exec_fail_on_error "$__cdist_type_gencode" > "$__cdist_tmp_file"
-else
-   if [ -e "$__cdist_type_gencode" ]; then
-      __cdist_exit_err "$__cdist_type_gencode exists, but is not executable"
-   fi
-
-   # Ensure it's empty, if there is no gencode
-   : > "$__cdist_tmp_file"
-fi
-
-# Only create code, if gencode created output
-if [ "$(wc -l < "$__cdist_tmp_file")" -gt 0 ]; then
-   cat - "$__cdist_tmp_file" << eof > "$__cdist_code_output"
-#
-# The following code was generated by $__cdist_type_gencode
-#
-
-eof
-   chmod u+x "${__cdist_code_output}"
-fi
diff --git a/bin/cdist-object-run b/bin/cdist-object-run
index 4f40e7c1..f96462d7 100755
--- a/bin/cdist-object-run
+++ b/bin/cdist-object-run
@@ -56,7 +56,7 @@ if [ ! -f "$__cdist_object_finished" ]; then
       done
    fi
 
-   cdist-object-gencode-run   "$__cdist_target_host" "$__cdist_object_self"
+   __cdist_object_gencode_run "$__cdist_object_self"
    cdist-object-push          "$__cdist_target_host" "$__cdist_object_self"
    cdist-object-code-run      "$__cdist_target_host" "$__cdist_object_self"
 
diff --git a/core/__cdist_object_gencode b/core/__cdist_object_gencode
new file mode 100755
index 00000000..585c9d9d
--- /dev/null
+++ b/core/__cdist_object_gencode
@@ -0,0 +1,67 @@
+#!/bin/sh
+#
+# 2011 Nico Schottelius (nico-cdist at schottelius.org)
+#
+# This file is part of cdist.
+#
+# cdist is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# cdist is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with cdist. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Generate code from one object (object must be relative path!)
+# WARNING: OUTPUT ON STDOUT, ERRORS NEED TO BE ON STDERR!
+#
+
+# FIXME: check variable names:
+# either prefix or use global or use functions directly
+# functions looks good, they are cheap anyway!
+
+__cdist_object_gencode()
+{
+   __cdist_myname="foo"
+   [ $# -eq 2 ] || __cdist_usage "<object>" "<type>"
+
+   __cdist_object_self="$1"; shift
+   __cdist_gencode_type="$1"; shift
+
+   __cdist_type="$(__cdist_type_from_object "$__cdist_object_self")"
+   __cdist_type_gencode="$(__cdist_type_gencode "$__cdist_type" "$__cdist_gencode_type")"
+   __cdist_code_output="$(__cdist_object_code "$__cdist_object_self" "$__cdist_gencode_type")"
+
+   # export variables for the gencode script
+   export __object_id="$(__cdist_object_id_from_object "$__cdist_object_self")"
+   export __object="$(__cdist_object_dir "$__cdist_object_self")"
+   export __global="$__cdist_out_dir"
+
+   if [ -x "$__cdist_type_gencode" ]; then
+      __cdist_exec_fail_on_error "$__cdist_type_gencode" > "$__cdist_tmp_file"
+   else
+      if [ -e "$__cdist_type_gencode" ]; then
+         __cdist_exit_err "$__cdist_type_gencode exists, but is not executable"
+      fi
+
+      # Ensure it's empty, if there is no gencode
+      : > "$__cdist_tmp_file"
+   fi
+
+   # Only create code, if gencode created output
+   if [ "$(wc -l < "$__cdist_tmp_file")" -gt 0 ]; then
+      cat - "$__cdist_tmp_file" << eof > "$__cdist_code_output"
+#
+# The following code was generated by $__cdist_type_gencode
+#
+
+eof
+      chmod u+x "${__cdist_code_output}"
+   fi
+}
diff --git a/core/__cdist_object_gencode_run b/core/__cdist_object_gencode_run
index 254ac1e4..308f5f33 100755
--- a/core/__cdist_object_gencode_run
+++ b/core/__cdist_object_gencode_run
@@ -22,17 +22,15 @@
 # For the given object create the code to be executed on the target.
 #
 
-. cdist-config
-[ $# -eq 2 ] || __cdist_usage "<target host> <object>"
-set -eu
+__cdist_object_gencode_run()
+{
+   __cdist_object_gencode_run_object="$1"; shift
 
-__cdist_target_host="$1"; shift
-__cdist_object_self="$1"; shift
+   __cdist_echo info "Generating local code "
+   __cdist_object_gencode "$__cdist_object_gencode_run_object" \
+      "${__cdist_name_gencode_local}"
 
-__cdist_echo info "Generating local code "
-cdist-object-gencode "$__cdist_target_host" "$__cdist_object_self" \
-   "${__cdist_name_gencode_local}"
-
-__cdist_echo info "Generating remote code "
-cdist-object-gencode "$__cdist_target_host" "$__cdist_object_self" \
+   __cdist_echo info "Generating remote code "
+   __cdist_object_gencode "$__cdist_object_gencode_run_object" \
    "${__cdist_name_gencode_remote}"
+}