Remove type alias.
Fix extraction.
Fix Leo's problem with NI demo.