consistently use dictionary literals
    
    Aside from not using two different idioms for the same thing, it
    performs better (not noticeably in our case, but hey).
    
    Signed-off-by: Nils Philippsen <nils@redhat.com>