Better datatypes (issue #4).