Minor code cleanup.
Merge branch 'master' into v0.10