Support more data types (notably, undefined)