Deal with null/undefined keys when resolving and batching
0.6.12