Added support for uncollapsed datatypes (normal example). Also small clean-up.