fix(basic/type.ml): merge changes from simple-bmc