Some cleanup tweaks.
Merge branch 'master' into sttm