More dict -> obj switches