Better handling of dictionary parameters.