A handful of language cleanups

Change-Id: If828e6c6d13ec8ef15d829d6c8fb950ad3af3f75
3 files changed