Update to work with datatype contexts.