Minor cleanup.
Merge branch 'master' into aqueous_compatibility