Add type hinting to defwrapper, clean up core
Merge branch 'develop' into hydrate