Issue #2: Make 'row' key optional.