Make uuid and type fields on an Entity a shortcut for .data['uuid'] and
.data['type'] respectively. Start cleaning up all other fields.