Rough sketch of merging smoothnessinfo

Simplifies fix for 24

Review URL: https://codereview.appspot.com/138240043