Fix #186
Fix #187 - wrap callable refs in $JsCallable with type args