Modify types for type-checking. Make parser handle data-declarations correctly