Fixed assignment analysis issues.