Attempting to sort out data type issues.

Currently, m, Z, khat, and lc are all miscast somehow.