Still a master of song craft right up until the end of his life.