Aligned versions of open source plug-in and the Google-internal one.
Minor code cleanup.
3 files changed