Minor code cleanup.
Merge branch 'v3.0'