- Made changes towards eliminating second function entry points
  for new calls, simplifying call handling