Finish expression inference.  Start on definitions.