@parndt, @robyurkowski, @ugisozols: You'd probably know the answer to this better than I do, but would it be better to have these default to `nil` instead of an empty hash?