Some dictionary-related cleanup