Handle dictionaries better; add tests as proof.