Tidy up: Avoid using 'iter' dictionary functions.