Modified smother_analysis to use the new/standard jsx interface.
Merge remote-tracking branch 'upstream/master'