* Cleanup contracts type registry * Remove some ! compiler overrides * More mappy lookups * Empty check