Stable build after all datatype refactorings