Replace entry matches with .get().unwrap_or_else where appropriate.