Code review change for #80.
Code review change for #80.

d2m/test,iglherme/Guttiest,d2m/test,apwilson/test,iglherme/Guttiest,grouma/test,iglherme/Guttiest,grouma/test,greglittlefield-wf/test,apwilson/test,grouma/test,d2m/test,kevmoo/test,apwilson/test,greglittlefield-wf/test,greglittlefield-wf/test,kevmoo/test,kevmoo/test