Add some aliases to suppress a bunch of warnings.

Change-Id: I08e803f009d5209881828149a81fb187947b7de0