Updated everything because if let is part of the language now.