Better handling and tests for discrete JSON and nulls.