Clean and consolidate export code #190

Adds HasDynamicNotation contraint function
I think the types are getting acceptable now...