Fixing issue with untrace forms
Adding support for cljx