Fixing parsing imports with macros and namespaces in parameters #45