diff --git a/src/compiler/Compiler.js b/src/compiler/Compiler.js
index dc16753..891f9a9 100644
--- a/src/compiler/Compiler.js
+++ b/src/compiler/Compiler.js
@@ -424,7 +424,7 @@ export default class Compiler {
         const hintArg = [];
         if ( node.hint ) { hintArg.push( this.$obj( { [ node.hint ]: Node.identifier( true ) } ) ); }
         else if ( this.currentEntry.mode === 'callee' ) {
-            hintArg.push( this.$obj( { funCall: Node.identifier( true ) } ) );
+            //hintArg.push( this.$obj( { funCall: Node.identifier( true ) } ) );
         }
         // Static mode?
         if ( node.type === 'ThisExpression' || [ 'param', 'self' ].includes( ref?.type ) || [ 'arguments' ].includes( node.name ) ) {
diff --git a/src/runtime/Autorun.js b/src/runtime/Autorun.js
index 86e3e09..49c9050 100644
--- a/src/runtime/Autorun.js
+++ b/src/runtime/Autorun.js
@@ -209,7 +209,7 @@ export default class Autorun extends EventTarget {
             // Return bare value here?
             if ( !depth || !signal.state || typeof signal.state !== 'object' ) {
                 let returnValue = signal.state;
-                if ( !depth && typeof signal.state === 'function' ) {
+                if ( typeof signal.state === 'function' ) {
                     // We're returning a proxy for functions instead of: signal.context.state[ signal.name ].bind( signal.context.state );
                     returnValue = Observer.proxy( signal.state, { membrane: signal } );
                 }