A bit of cleanup and improvement. This is cleaner and more readable.
Merge branch 'release/3.3a'