Don't store null values, and return empty arrays/objects as null