The charged and neutral pion masses revisited