Make AutoDict more robust.

simpler + works = win